Temporary fix to include PTY support in domU builds.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/buildconfigs/linux-defconfig_xenU_x86_32 b/buildconfigs/linux-defconfig_xenU_x86_32
index 66e2291c72186c9b27ed1d6e79c53e930dab1f59..39c9ee936365b1f40d16003fe6b2f57a98a260b2 100644 (file)
--- a/buildconfigs/linux-defconfig_xenU_x86_32
+++ b/buildconfigs/linux-defconfig_xenU_x86_32
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16-rc2-xenU
-# Fri Feb  3 16:57:27 2006
+# Mon Feb  6 13:25:40 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -381,6 +381,9 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 
 #
 # SN Devices

diff --git a/buildconfigs/linux-defconfig_xenU_x86_64 b/buildconfigs/linux-defconfig_xenU_x86_64
index 3b1e706cc5e5b8f32f8a009ede11fcd5973de088..8c19d6ef8aebd589bfeeed6e7866d6c97077391a 100644 (file)
--- a/buildconfigs/linux-defconfig_xenU_x86_64
+++ b/buildconfigs/linux-defconfig_xenU_x86_64
@@ -600,6 +600,9 @@ CONFIG_ATMEL=m
 # Wan interfaces
 #
 # CONFIG_WAN is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 
 #
 # ATM drivers

diff --git a/linux-2.6-xen-sparse/drivers/Kconfig b/linux-2.6-xen-sparse/drivers/Kconfig
index 6a9851b8993f1ea1ef415d23227df13bdee9fe0b..ebb5c076af54063f576d94ba34b0352fcbc85b8d 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/Kconfig
+++ b/linux-2.6-xen-sparse/drivers/Kconfig
@@ -77,6 +77,20 @@ source "drivers/mmc/Kconfig"
 source "drivers/infiniband/Kconfig"
 endif
 
+if XEN && !XEN_PHYSDEV_ACCESS
+# Gross hack. Fix later by allowing unprivileged guest to include
+# char/Kconfig without breaking the build.
+config UNIX98_PTYS
+        bool
+        default y
+config LEGACY_PTYS
+        bool
+        default y
+config LEGACY_PTY_COUNT
+        int
+        default "256"
+endif
+
 source "drivers/sn/Kconfig"
 
 source "drivers/edac/Kconfig"